Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

eos-paygd: Fix meson conflation between eos-paygd.conf output files #17

Merged
merged 1 commit into from
Mar 30, 2018

Conversation

pwithnall
Copy link
Contributor

This only needs to be merged on eos3.3.

If meson has two configure_file() rules with the same output in the same
directory, one of them will silently overwrite the other. This was
causing the sysusers.d rules to be installed in the tmpfiles.d directory
as well as the sysusers.d directory, and causing tmpfiles.d to fail.

Fix that by renaming the eos-paygd.conf for tmpfiles.d to
eos-paygd-state.conf, taking advantage of tmpfiles.d’s support for
‘parts’ of packages.

Signed-off-by: Philip Withnall withnall@endlessm.com

https://phabricator.endlessm.com/T21730

If meson has two configure_file() rules with the same output in the same
directory, one of them will silently overwrite the other. This was
causing the sysusers.d rules to be installed in the tmpfiles.d directory
as well as the sysusers.d directory, and causing tmpfiles.d to fail.

Fix that by renaming the eos-paygd.conf for tmpfiles.d to
eos-paygd-state.conf, taking advantage of tmpfiles.d’s support for
‘parts’ of packages.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://phabricator.endlessm.com/T21730
@pwithnall pwithnall self-assigned this Mar 30, 2018
@pwithnall pwithnall requested a review from mariospr March 30, 2018 16:50
@mariospr mariospr merged commit 193ca1d into eos3.3 Mar 30, 2018
@mariospr mariospr deleted the T21730-stupid-meson branch March 30, 2018 16:59
@pwithnall
Copy link
Contributor Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants